Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 3 Apr 2006 22:58:40 +0000 (23:58 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 3 Apr 2006 22:58:40 +0000 (23:58 +0100)

Trivial merge